From 5dd6be7e601946afb7f12634e045e5b57e53532c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 19 May 2010 21:14:57 +0100 Subject: [PATCH] x86: During boot, initialise cpu-numa info for all present CPUs. Previously we would skip ones we didn't bring online. Signed-off-by: Keir Fraser --- xen/arch/x86/setup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 34162f6bdb..845f31d531 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1007,15 +1007,13 @@ void __init __start_xen(unsigned long mbi_p) for_each_present_cpu ( i ) { - if ( num_online_cpus() >= max_cpus ) - break; - if ( !cpu_online(i) ) - cpu_up(i); - /* Set up cpu_to_node[]. */ srat_detect_node(i); /* Set up node_to_cpumask based on cpu_to_node[]. */ numa_add_cpu(i); + + if ( (num_online_cpus() < max_cpus) && !cpu_online(i) ) + cpu_up(i); } printk("Brought up %ld CPUs\n", (long)num_online_cpus()); -- 2.30.2